Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifest: Update sdk-mcuboot #19717

Merged
merged 2 commits into from
Jan 28, 2025
Merged

manifest: Update sdk-mcuboot #19717

merged 2 commits into from
Jan 28, 2025

Conversation

nordicjm
Copy link
Contributor

Updates MCUboot to fix an issue with triple erasing a wrong slot s0/s1 firmware update

@nordicjm nordicjm requested a review from a team as a code owner December 30, 2024 11:49
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Dec 30, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 30, 2024 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@99d4ae9 nrfconnect/sdk-mcuboot@3a25855 (main) nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 30, 2024 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 6

Inputs:

Sources:

sdk-nrf: PR head: 079fc7b7d1898fa5817f9c5e46997c90630f5530
mcuboot: PR head: 3a25855215a2cfc64c3f0e2dba3ada3f11df7816

more details

sdk-nrf:

PR head: 079fc7b7d1898fa5817f9c5e46997c90630f5530
merge base: e24b7684210b99007a518e261b4bedae025ebf4a
target head (main): 2e8ae9ba8e507ff0609fb461b18440242a116e19
Diff

mcuboot:

PR head: 3a25855215a2cfc64c3f0e2dba3ada3f11df7816
merge base: 99d4ae97314c413208746f1fb272eb4ecf85b3ea
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (3) 
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── bootutil
│  │  │  │  ├── src
│  │  │  │  │  │ loader.c
doc
│  ├── nrf
│  │  ├── releases_and_maturity
│  │  │  ├── releases
│  │  │  │  │ release-notes-changelog.rst
west.yml

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 518
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-sdk-mcuboot
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

nvlsianpu
nvlsianpu reviewed Jan 15, 2025
View reviewed changes
Copy link
Contributor

@nvlsianpu nvlsianpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something is fishy there: saw something about 'Cleaned-up secondary slot' in failing CI test. Either a test must be aligned or something is wrong with the patch.

@nordicjm nordicjm requested a review from nvlsianpu January 21, 2025 15:39
@nordicjm
manifest: Update sdk-mcuboot
b95bab4 
Updates MCUboot to fix an issue with triple erasing a wrong slot
s0/s1 firmware update

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm nordicjm requested a review from a team as a code owner January 23, 2025 10:47
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Jan 23, 2025
@nordicjm nordicjm requested a review from gmarull January 23, 2025 10:48
@NordicBuilder NordicBuilder removed the DNM label Jan 23, 2025
@nordicjm
doc: releases: changelog: Add note on fix of triple erase
079fc7b 
Adds a note on this fix

Signed-off-by: Jamie McCrae <[email protected]>
@nvlsianpu nvlsianpu merged commit 26ef2a3 into nrfconnect:main Jan 28, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlescufi carlescufi carlescufi approved these changes

@nvlsianpu nvlsianpu nvlsianpu approved these changes

@peknis peknis peknis approved these changes

@annwoj annwoj annwoj approved these changes

@michalek-no michalek-no michalek-no approved these changes

@de-nordic de-nordic Awaiting requested review from de-nordic

@gmarull gmarull Awaiting requested review from gmarull

@bjarki-andreasen bjarki-andreasen Awaiting requested review from bjarki-andreasen

Assignees
No one assigned
Labels
doc-required PR must not be merged without tech writer approval. manifest manifest-mcuboot
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@nordicjm @NordicBuilder @carlescufi @nvlsianpu @peknis @annwoj @michalek-no